Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 15 Mar 2010 22:14:49 +0000 (22:14 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 15 Mar 2010 22:14:49 +0000 (22:14 +0000)

Trivial merge